Cast tile, stipple and clip_mask pointers to gintptr when calculating

2008-08-05  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkgc.c: Cast tile, stipple and clip_mask pointers to
	gintptr when calculating hash, so we get all of the pointer bits
	on Win64 where long is 32 bits.

svn path=/trunk/; revision=21002

diff --git a/ChangeLog b/ChangeLog
index 50f285b6c5559db3273663638998cfc71678764f..ecacd648a39c6bdd63726ce4982c291cba2bc457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-05  Tor Lillqvist  <tml@novell.com>
+
+       * gtk/gtkgc.c: Cast tile, stipple and clip_mask pointers to
+       gintptr when calculating hash, so we get all of the pointer bits
+       on Win64 where long is 32 bits.
+
 2008-08-05  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkprintoperation-win32.c: Don't need to declare

diff --git a/gtk/gtkgc.c b/gtk/gtkgc.c
index 8e6bc9f8d52bab3400f46da72f20169f05d969ed..15d863621fc7c1dac2b0d55bcb9f216661a0dd47 100644 (file)
--- a/gtk/gtkgc.c
+++ b/gtk/gtkgc.c
@@ -222,15 +222,15 @@ gtk_gc_key_hash (gpointer key)
     }
   if (keyval->mask & GDK_GC_TILE)
     {
-      hash_val += (glong) keyval->values.tile;
+      hash_val += (gintptr) keyval->values.tile;
     }
   if (keyval->mask & GDK_GC_STIPPLE)
     {
-      hash_val += (glong) keyval->values.stipple;
+      hash_val += (gintptr) keyval->values.stipple;
     }
   if (keyval->mask & GDK_GC_CLIP_MASK)
     {
-      hash_val += (glong) keyval->values.clip_mask;
+      hash_val += (gintptr) keyval->values.clip_mask;
     }
   if (keyval->mask & GDK_GC_SUBWINDOW)
     {